Merge pull request #118 from bochecha/master