Merge branch 'master' into devel
Can import without openjp2 library now.
Merge branch 'issue4' into devel
Bumped version.
Merge branch 'devel'