Merge pull request #7 from mali/working