SaraJo Merge pull request #27 from xPaw/master