Merge pull request #15 from maverickwoo/master

housekeeping