PerfectCarl Merge pull request #5 from arnzel/master