Merge two branches into one

References issue #22
Merge branch 'gh-pages' of https://github.com/alfredxing/brick into gh-pages