Merge pull request #563 from mcmonkey4eva/master

The only pull request with working properties