Merged Pull Request #7 into "development" branch. Thanks mMontu for your input!
This commit also fix some of the problems reported on issue #6. Still working on it.