synching
Merge pull request #4 from bgoli/master

Final synch (hopefully)