fixed import under py2
Merge branch 'master' into 0.2
0.2.1a - fixing import under python2