Changed markup a bit
Merged with origin master