Merge pull request #2 from jenkie/master

Update 17-Apr-2014