diff --git a/src/audio.c b/src/audio.c
index 2c0ed3de3..9d1aa014e 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -95,9 +95,12 @@ typedef struct Music {
 // a dedicated mix channel.
 typedef struct AudioContext_t {
     unsigned short sampleRate;         // default is 48000
-    unsigned char bitsPerSample;       // 16 is default
+    BPS bitsPerSample;                 // 16 is default
     mix_t mixChannel;                  // 0-3 or mixA-mixD, each mix channel can receive up to one dedicated audio stream
     channel_t channels;                // 1=mono, 2=stereo
+    ALenum alFormat;                   // openAL format specifier
+    ALuint alSource;                   // openAL source
+    ALuint alBuffer[2];                // openAL sample buffer
 } AudioContext_t;
 
 #if defined(AUDIO_STANDALONE)
@@ -193,8 +196,8 @@ bool AudioDeviceReady(void)
 
 // Audio contexts are for outputing custom audio waveforms, This will shut down any other sound sources currently playing
 // The mix_t is what mix channel you want to operate on, mixA->mixD are the ones available. Each mix channel can only be used one at a time.
-// exmple usage is InitAudioContext(48000, 16, mixA, stereo);
-AudioContext InitAudioContext(unsigned short sampleRate, unsigned char bitsPerSample, mix_t mixChannel, channel_t channels)
+// exmple usage is InitAudioContext(48000, sixteenBPS, mixA, stereo);
+AudioContext InitAudioContext(unsigned short sampleRate, BPS bitsPerSample, mix_t mixChannel, channel_t channels)
 {
     if(!AudioDeviceReady()) InitAudioDevice();
     else StopMusicStream();
@@ -206,6 +209,30 @@ AudioContext InitAudioContext(unsigned short sampleRate, unsigned char bitsPerSa
         ac->mixChannel = mixChannel;
         ac->channels = channels;
         mixChannelsActive_g[mixChannel] = ac;
+        
+        // setup openAL format
+        if (channels == mono)
+        {
+            if (bitsPerSample == eightBPS ) ac->alFormat = AL_FORMAT_MONO8;
+            else if (bitsPerSample == sixteenBPS) ac->alFormat = AL_FORMAT_MONO16;
+        }
+        else if (channels == stereo)
+        {
+            if (bitsPerSample == eightBPS ) ac->alFormat = AL_FORMAT_STEREO8;
+            else if (bitsPerSample == sixteenBPS) ac->alFormat = AL_FORMAT_STEREO16;
+        }
+        
+        // Create an audio source
+        alGenSources(1, &ac->alSource);
+        alSourcef(ac->alSource, AL_PITCH, 1);
+        alSourcef(ac->alSource, AL_GAIN, 1);
+        alSource3f(ac->alSource, AL_POSITION, 0, 0, 0);
+        alSource3f(ac->alSource, AL_VELOCITY, 0, 0, 0);
+        
+        // Create Buffer
+        alGenBuffers(2, &ac->alBuffer);
+        
+        
         return ac;
     }
     return NULL;
@@ -216,15 +243,22 @@ void CloseAudioContext(AudioContext ctx)
 {
     AudioContext_t *context = (AudioContext_t*)ctx;
     if(context){
+        alDeleteSources(1, &context->alSource);
+        alDeleteBuffers(2, &context->alBuffer);
         mixChannelsActive_g[context->mixChannel] = NULL;
         free(context);
+        ctx = NULL;
     }
 }
 
 // Pushes more audio data into context mix channel, if none are ever pushed then zeros are fed in
 void UpdateAudioContext(AudioContext ctx, void *data, unsigned short *dataLength)
 {
-    ;
+    AudioContext_t *context = (AudioContext_t*)ctx;
+    if(!musicEnabled && context && mixChannelsActive_g[context->mixChannel] == context)
+    {
+        ;
+    }
 }
 
 
diff --git a/src/audio.h b/src/audio.h
index cadf2bc15..28fe4b3c0 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -45,8 +45,9 @@
         typedef enum { false, true } bool;
     #endif
 #endif
-typedef enum { silence, mono, stereo } channel_t;
-typedef enum { mixA, mixB, mixC, mixD } mix_t; // Used for mixing/muxing up to four diferent audio streams
+typedef enum { silence, mono, stereo } channel_t;    // number of audio sources per sample
+typedef enum { mixA, mixB, mixC, mixD } mix_t;       // Used for mixing/muxing up to four diferent audio samples
+typedef enum { eightBPS, sixteenBPS } BPS;           // Either 8 or 16 bit quality samples
 
 // Sound source type
 typedef struct Sound {
@@ -87,7 +88,7 @@ bool AudioDeviceReady(void);                                    // True if call
 // Audio contexts are for outputing custom audio waveforms, This will shut down any other sound sources currently playing
 // The mix_t is what mix channel you want to operate on, mixA->mixD are the ones available. Each mix channel can only be used one at a time.
 // exmple usage is InitAudioContext(48000, 16, mixA, stereo);
-AudioContext InitAudioContext(unsigned short sampleRate, unsigned char bitsPerSample, mix_t mixChannel, channel_t channels);
+AudioContext InitAudioContext(unsigned short sampleRate, BPS bitsPerSample, mix_t mixChannel, channel_t channels);
 void CloseAudioContext(AudioContext ctx);                      // Frees audio context
 void UpdateAudioContext(AudioContext ctx, void *data, unsigned short *dataLength); // Pushes more audio data into context mix channel, if none are ever pushed then zeros are fed in
 
diff --git a/src/raylib.h b/src/raylib.h
index 5b7b34fdd..83f58a515 100644
--- a/src/raylib.h
+++ b/src/raylib.h
@@ -265,8 +265,9 @@
         typedef enum { false, true } bool;
     #endif
 #endif
-typedef enum { silence, mono, stereo } channel_t;
-typedef enum { mixA, mixB, mixC, mixD } mix_t; // Used for mixing/muxing up to four diferent audio streams
+typedef enum { silence, mono, stereo } channel_t;    // number of audio sources per sample
+typedef enum { mixA, mixB, mixC, mixD } mix_t;       // Used for mixing/muxing up to four diferent audio samples
+typedef enum { eightBPS, sixteenBPS } BPS;           // Either 8 or 16 bit quality samples
 
 // byte type
 typedef unsigned char byte;
@@ -875,7 +876,7 @@ bool AudioDeviceReady(void);                                    // True if call
 // Audio contexts are for outputing custom audio waveforms, This will shut down any other sound sources currently playing
 // The mix_t is what mix channel you want to operate on, mixA->mixD are the ones available. Each mix channel can only be used one at a time.
 // exmple usage is InitAudioContext(48000, 16, mixA, stereo);
-AudioContext InitAudioContext(unsigned short sampleRate, unsigned char bitsPerSample, mix_t mixChannel, channel_t channels);
+AudioContext InitAudioContext(unsigned short sampleRate, BPS bitsPerSample, mix_t mixChannel, channel_t channels);
 void CloseAudioContext(AudioContext ctx);                      // Frees audio context
 void UpdateAudioContext(AudioContext ctx, void *data, unsigned short *dataLength); // Pushes more audio data into context mix channel, if none are ever pushed then zeros are fed in