Merge pull request #6 from hazah/master

Update from master.