following done
Merge pull request #3 from ThatTobMate/master

following done