Fixed issue #7 and #9
Merge branch 'master' of github.com:chung-leong/av
Fixed issue #11