Merge pull request #12 from reinsmeister/master

MergeUpdates
Merge pull request #14 from reinsmeister/master

Pull Request - Shar
Merge pull request #3 from potchie0o8/master

Merge pull request #12 from reinsmeister/master