#56
#56
#56
Merge branch 'master' into python2
#56
#56
#56
#56 and copyright lines
#56
#56
#56
#56
#56
fixed #56