Merge Pull Request #53 - Thanks @Caleydon