Merge pull request #68 from daGnutt/master

Merging master to stable.
Merge branch 'master' into stable
Merge branch 'master' into stable
Resolved issue #70