v1 working.
Merge pull request #4 from cmivxx/dev-a

v1 working.