rainman110/test — pull request #2 by rainman110 (2014-12-10 14:43:35+00:00)
Title: Fixed stuff

Integrate to master