Fixed OnCircle/issues#27
Fixed OnCircle/issues#27
Merge remote-tracking branch 'origin/master'