updates for lukes code
Merge pull request #1 from erikaamland/master

updates lukes code