updates... should be finished now...
Merge pull request #1 from dgruss/master

updates... should be finished now...