Final checkin
Merge pull request #25 from codefalcon/feature

Final checkin