rainman110/test — pull request #1 by rainman110 (2014-12-10 14:39:50+00:00)
Title: Fixed stuff

Please integrate