Merge pull request #2 from BasisHub/master

merge from master
Merge pull request #3 from BasisHub/master

merge from master
Merge pull request #4 from BasisHub/master

merge from master
Merge pull request #15 from TimBB/master

merge from master