Added stylus support
Bump version to 0.2.3
Merge remote-tracking branch 'upstream/devel' into devel