Cleaned up
Merge branch 'alpha' of https://github.com/ghousseyn/phiber into alpha