Update 12/4/2014
finally fixed errors from commit yesterday