Merge pull request #14 from murrekatt/develop

Fixed issue #13.