zack's final commit
Merge pull request #15 from alosada/zack

zack's final commit