Merge pull request #2 from potchie0o8/master

pull!
Cleaned

Github tae!!!!
Merge pull request #12 from reinsmeister/master

MergeUpdates