fix issue #9
Merge remote-tracking branch 'origin/master'
2013 -> 2014 in copyright, fix pep8 error