Merge pull request #118 from fxbt/master