Merge branch 'release/0.0.4'
Merge tag '0.0.4' into develop

workable on Xcode 6