converting shorttags to longtags
Merge branch 'longtags'