should constants instead of literals - only in function for now...
Merge branch 'master' of dev.sourcefabric.org:airtime