closes #42
closes #101
Merge pull request #104 from mikedao/42

42