Merge pull request #33 from nvembar/master