Added a test branch [ci skip]
Merge pull request #3 from whisperity/merge_test