Synched my version to James' repo. Solves issue #1