modified for supprt python3
Merge branch 'feature/sximada/1'