fixes
more fixes
Merge pull request #16 from amychiu/amy/development2

Amy/development2