Merge pull request #118 from fabian1995/master

Alpha 1.2 Build 4