#164 #167 #169
Merge pull request #171 from objcow/master

#164