merged all
Merge pull request #2 from vandervidi/master

 merged all