Quick refactor based on changes from pull request.
Version 0.3.3