Fixed #27
Fixed #24
Improve #27
Merge branch 'release/R20131009'