fixed #10
Merge branch 'feature/encoding_bug' into develop
Merge branch 'release/v2013.06.19'