Merge pull request #4 from siriwardenap/master

wj to master