feliam Merge pull request #17 from wessupermare/master