2014-12-17 Update
Update 2014-12-20
Merge pull request #1 from Gombly/master

2014-12-17 Update