closes #109, closes #110
Merge pull request #146 from privateip/develop

closes #109, closes #110