Fixed #7
Merge pull request #8 from nichochar/develop

Fixed #7