commit 2014-12-15

updated code on github