Revised markup and added some bitmap support. Bitmap support not tested yet.