major changes
Merge pull request #4 from srimola/feature-vcallinan

major changes