Comments updated to match 3.3 standards and #24 solved