Finished FrontPage

Finished, but need to be more robust.
Merge remote-tracking branch 'upstream/master'

Please help me check..don't know whether I am doing right.
merges shans changes and fixes issue #56