Merge Pull Request #21 - thanks @Caleydon