Merge pull request #284 from remear/master

Updates