some updates
Merge pull request #18 from amychiu/amy/development2

some updates