Merge pull request #1 from mikegiberson/master

merge
Merge pull request #2 from mikegiberson/master

merge
Merge pull request #3 from mikegiberson/master

merge
commit
Revert "commit"

This reverts commit 38ffd15753c3afa2bce1e5414866d7923b7b52b2.
Merge pull request #55 from lovudsharma/master

Integrate jasmin