Merge branch '0.3.0' of https://github.com/gbiczo/oxcelix
Merge branch 'master' of https://github.com/gbiczo/oxcelix
Merge branch '0.3.0' of https://github.com/gbiczo/oxcelix
Merge branch 'master' of https://github.com/gbiczo/oxcelix

Conflicts:
	oxcelix.gemspec
resolved gemspec merge conflict