removed [unresolved]
Merge pull request #20 from dotch/master

removed [unresolved]